remove conflict markers

diff --git a/ChangeLog b/ChangeLog
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f6cee8625ac846d4d60712817a6933902d533b3..4bdff1bbc9de856deb9e09be0ccc60de3c129542 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -567,7 +567,6 @@ Fri Oct  5 19:06:07 2001  Kristian Rietveld  <kristian@planet.nl>
        it instead of "search-dialog" (when getting/setting the search dialog
        widget).
 
->>>>>>> 1.2409
 2001-10-05  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/stock_broken_image.png: broken images icon